From 46e4d22c8956efd65c6ec371a1ad7e6b1afc0912 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Wed, 26 Nov 2008 08:36:10 +0000 Subject: [PATCH] =?utf8?q?Bug=20561504=20=E2=80=93=20testgtk=20should=20lo?= =?utf8?q?ad=20rc=20file=20from=20sub=20folder?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2008-11-26 Christian Dywan Bug 561504 – testgtk should load rc file from sub folder * tests/testgtk.c (main): Make testgtk look in subfolder and warn if not found svn path=/trunk/; revision=21809 --- ChangeLog | 7 +++++++ tests/testgtk.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index e74727b1ac..e3aecd3003 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-11-26 Christian Dywan + + Bug 561504 – testgtk should load rc file from sub folder + + * tests/testgtk.c (main): + Make testgtk look in subfolder and warn if not found + 2008-11-25 Johan Dahlin Bug 559947 – Unchecked dependency on python>=2.4 diff --git a/tests/testgtk.c b/tests/testgtk.c index ccb06c8fae..49dc119c30 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -13895,6 +13895,10 @@ main (int argc, char *argv[]) */ if (file_exists ("testgtkrc")) gtk_rc_add_default_file ("testgtkrc"); + else if (file_exists ("tests/testgtkrc")) + gtk_rc_add_default_file ("tests/testgtkrc"); + else + g_warning ("Couldn't find file \"testgtkrc\"."); g_set_application_name ("GTK+ Test Program"); -- 2.30.2